Skip to content

Manually merge noble to resolute#668

Merged
aramprice merged 9 commits into
ubuntu-resolutefrom
manually-merge-noble-to-resolute
Jun 23, 2026
Merged

Manually merge noble to resolute#668
aramprice merged 9 commits into
ubuntu-resolutefrom
manually-merge-noble-to-resolute

Conversation

@aramprice

Copy link
Copy Markdown
Member

NOTE: this repository uses a "Merge Forward" strategy

Changes should be made in the earliest applicable branch, and
merged forward through subsequent branches.

  1. PR should be created against the oldest stemcell branch, ex: ubuntu-<short_name-N>
  2. After this PR has been merged create a PR to merge ubuntu-<short_name-N> into ubuntu-<short_name-N+1>
  3. Repeat as needed for subsequent stemcell line branches

Copilot AI review requested due to automatic review settings June 23, 2026 00:02

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot was unable to review this pull request because the user who requested the review has reached their quota limit.

@coderabbitai

coderabbitai Bot commented Jun 23, 2026

Copy link
Copy Markdown
Contributor

Important

Review skipped

Too many files!

This PR contains 157 files, which is 7 over the limit of 150.

To get a review, narrow the scope:
• coderabbit review --type committed # exclude uncommitted changes
• coderabbit review --dir # limit to a subdirectory
• coderabbit review --base # compare against a closer base

Upgrade to a paid plan to raise the limit.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: ASSERTIVE

Plan: Pro

Run ID: d90a384d-c99a-4937-a4e1-1b22edc77eba

📥 Commits

Reviewing files that changed from the base of the PR and between 7d91bba and c547f34.

⛔ Files ignored due to path filters (1)
  • stemcell_builder/stages/bosh_monit/assets/monit-5.29.0.tar.gz is excluded by !**/*.gz
📒 Files selected for processing (157)
  • .envrc
  • .github/workflows/sbom.yml
  • .gitignore
  • README.md
  • Rakefile
  • acceptance-tests/ipv4director/auditd/smoke_test.go
  • acceptance-tests/ipv4director/ipv6basic/basic_test.go
  • acceptance-tests/ipv4director/ipv6basic/manifest.yml
  • acceptance-tests/ipv4director/smoke/smoke_test.go
  • acceptance-tests/ipv6director/ipv6full/full_test.go
  • bosh-stemcell/image-metalinks/ubuntu-resolute.meta4
  • bosh-stemcell/lib/bosh/stemcell/build_environment.rb
  • bosh-stemcell/lib/bosh/stemcell/builder_options.rb
  • bosh-stemcell/lib/bosh/stemcell/definition.rb
  • bosh-stemcell/lib/bosh/stemcell/infrastructure.rb
  • bosh-stemcell/lib/bosh/stemcell/stage_collection.rb
  • bosh-stemcell/spec/assets/dpkg-list-ubuntu-azure-additions.txt
  • bosh-stemcell/spec/assets/dpkg-list-ubuntu-kernel.txt
  • bosh-stemcell/spec/assets/dpkg-list-ubuntu-softlayer-additions.txt
  • bosh-stemcell/spec/assets/dpkg-list-ubuntu-vsphere-additions.txt
  • bosh-stemcell/spec/assets/dpkg-list-ubuntu.txt
  • bosh-stemcell/spec/bosh/stemcell/builder_options_spec.rb
  • bosh-stemcell/spec/bosh/stemcell/definition_spec.rb
  • bosh-stemcell/spec/bosh/stemcell/infrastructure_spec.rb
  • bosh-stemcell/spec/bosh/stemcell/stage_collection_spec.rb
  • bosh-stemcell/spec/bosh/stemcell/stemcell_packager_spec.rb
  • bosh-stemcell/spec/os_image/ubuntu_spec.rb
  • bosh-stemcell/spec/spec_helper.rb
  • bosh-stemcell/spec/stemcells/alicloud_spec.rb
  • bosh-stemcell/spec/stemcells/aws_spec.rb
  • bosh-stemcell/spec/stemcells/azure_spec.rb
  • bosh-stemcell/spec/stemcells/cis_spec.rb
  • bosh-stemcell/spec/stemcells/fips_spec.rb
  • bosh-stemcell/spec/stemcells/google_spec.rb
  • bosh-stemcell/spec/stemcells/openstack_spec.rb
  • bosh-stemcell/spec/stemcells/rosetta_spec.rb
  • bosh-stemcell/spec/stemcells/softlayer_spec.rb
  • bosh-stemcell/spec/stemcells/stig_spec.rb
  • bosh-stemcell/spec/stemcells/ubuntu_spec.rb
  • bosh-stemcell/spec/stemcells/vcloud_spec.rb
  • bosh-stemcell/spec/stemcells/vsphere_spec.rb
  • bosh-stemcell/spec/stemcells/warden_spec.rb
  • bosh-stemcell/spec/support/os_image_chrony_shared_examples.rb
  • bosh-stemcell/spec/support/os_image_linux_kernel_modules_shared_examples.rb
  • bosh-stemcell/spec/support/os_image_linux_kernel_shared_examples.rb
  • bosh-stemcell/spec/support/os_image_shared_examples.rb
  • bosh-stemcell/spec/support/os_image_systemd_shared_examples.rb
  • bosh-stemcell/spec/support/stemcell_image.rb
  • bosh-stemcell/spec/support/stemcell_shared_examples.rb
  • ci/configure.sh
  • ci/docker/os-image-stemcell-builder/.gitignore
  • ci/docker/os-image-stemcell-builder/Dockerfile
  • ci/pipeline-template.yml
  • ci/pipeline-vars.yml
  • docs/noble-dev.md
  • image-metalinks/ubuntu-noble/ubuntu-noble.meta4
  • image-metalinks/ubuntu-resolute/ubuntu-resolute.meta4
  • scripts/repack-helpers/convert-raw-to-vmdk.sh
  • scripts/stemcell-repack-debugger.sh
  • stemcell_builder/lib/helpers.sh
  • stemcell_builder/lib/prelude_bosh.bash
  • stemcell_builder/stages/base_apt/apply.sh
  • stemcell_builder/stages/base_apt/assets/etc/apt/apt.conf.d/50unattended-upgrades
  • stemcell_builder/stages/base_ssh/apply.sh
  • stemcell_builder/stages/base_ssh/assets/10-ssh-firstboot-done.conf
  • stemcell_builder/stages/base_ubuntu_build_essential/apply.sh
  • stemcell_builder/stages/base_ubuntu_firstboot/apply.sh
  • stemcell_builder/stages/base_ubuntu_firstboot/assets/etc/rc.local
  • stemcell_builder/stages/base_ubuntu_firstboot/assets/etc/systemd/system/firstboot.service
  • stemcell_builder/stages/base_ubuntu_firstboot/assets/root/firstboot.sh
  • stemcell_builder/stages/base_ubuntu_packages/apply.sh
  • stemcell_builder/stages/base_ubuntu_packages/assets/apparmor-local-sbin.dhclient
  • stemcell_builder/stages/base_ubuntu_packages/assets/runit.service
  • stemcell_builder/stages/base_ubuntu_warden_rosetta/apply.sh
  • stemcell_builder/stages/base_ubuntu_warden_rosetta/assets/rosetta-compat.conf
  • stemcell_builder/stages/base_warden/apply.sh
  • stemcell_builder/stages/base_warden/assets/runit/cron/run
  • stemcell_builder/stages/base_warden/assets/runit/rsyslog/run
  • stemcell_builder/stages/base_warden/assets/runit/ssh/run
  • stemcell_builder/stages/base_warden/assets/runsvdir-start
  • stemcell_builder/stages/base_warden/assets/service
  • stemcell_builder/stages/base_warden/assets/unshare
  • stemcell_builder/stages/bosh_alicloud_agent_settings/assets/agent.json
  • stemcell_builder/stages/bosh_alicloud_agent_settings/assets/agent.md
  • stemcell_builder/stages/bosh_audit/shared_functions.bash
  • stemcell_builder/stages/bosh_aws_agent_settings/assets/agent.json
  • stemcell_builder/stages/bosh_aws_agent_settings/assets/agent.md
  • stemcell_builder/stages/bosh_azure_agent_settings/assets/agent.json
  • stemcell_builder/stages/bosh_cloudstack_agent_settings/assets/agent.json
  • stemcell_builder/stages/bosh_enable_password_authentication/apply.sh
  • stemcell_builder/stages/bosh_go_agent/apply.sh
  • stemcell_builder/stages/bosh_go_agent/assets/bosh-agent.service
  • stemcell_builder/stages/bosh_go_agent/assets/runit/agent/log/run
  • stemcell_builder/stages/bosh_go_agent/assets/runit/agent/run
  • stemcell_builder/stages/bosh_go_agent/assets/runit/monit/down
  • stemcell_builder/stages/bosh_go_agent/assets/runit/monit/log/run
  • stemcell_builder/stages/bosh_go_agent/assets/runit/monit/run
  • stemcell_builder/stages/bosh_google_agent_settings/assets/agent.json
  • stemcell_builder/stages/bosh_google_agent_settings/assets/agent.md
  • stemcell_builder/stages/bosh_monit/apply.sh
  • stemcell_builder/stages/bosh_monit/assets/monit
  • stemcell_builder/stages/bosh_monit/assets/monit-access-helper.sh
  • stemcell_builder/stages/bosh_monit/assets/monit.service
  • stemcell_builder/stages/bosh_monit/assets/restrict-monit-api-access
  • stemcell_builder/stages/bosh_ntp/apply.sh
  • stemcell_builder/stages/bosh_openstack_agent_settings/assets/agent.json
  • stemcell_builder/stages/bosh_openstack_agent_settings/assets/agent.md
  • stemcell_builder/stages/bosh_softlayer_agent_settings/apply.sh
  • stemcell_builder/stages/bosh_sysctl/assets/60-bosh-sysctl.conf
  • stemcell_builder/stages/bosh_systemd/apply.sh
  • stemcell_builder/stages/bosh_systemd_resolved/apply.sh
  • stemcell_builder/stages/bosh_systemd_resolved/assets/add-container-listener-address.conf
  • stemcell_builder/stages/bosh_systemd_resolved/assets/create-systemd-resolved-listener-address.service
  • stemcell_builder/stages/bosh_users/assets/sudoers
  • stemcell_builder/stages/bosh_vsphere_agent_settings/assets/agent.json
  • stemcell_builder/stages/delay_monit_start/apply.sh
  • stemcell_builder/stages/dev_tools_config/assets/generate_dev_tools_file_list.sh
  • stemcell_builder/stages/image_create/apply.sh
  • stemcell_builder/stages/image_create_softlayer_two_partitions/apply.sh
  • stemcell_builder/stages/image_create_softlayer_two_partitions/config.sh
  • stemcell_builder/stages/image_install_grub/apply.sh
  • stemcell_builder/stages/image_install_grub_efi/apply.sh
  • stemcell_builder/stages/image_install_grub_efi/config.sh
  • stemcell_builder/stages/image_install_grub_softlayer_two_partitions/apply.sh
  • stemcell_builder/stages/image_install_grub_softlayer_two_partitions/config.sh
  • stemcell_builder/stages/logrotate_config/assets/logrotate.timer
  • stemcell_builder/stages/logrotate_config/assets/opensuse-logrotate.conf
  • stemcell_builder/stages/password_policies/apply.sh
  • stemcell_builder/stages/password_policies/assets/opensuse/common-account.patch
  • stemcell_builder/stages/password_policies/assets/opensuse/common-auth.patch
  • stemcell_builder/stages/password_policies/assets/opensuse/common-password.patch
  • stemcell_builder/stages/password_policies/assets/ubuntu/common-auth.patch
  • stemcell_builder/stages/password_policies/assets/ubuntu/common-password.patch
  • stemcell_builder/stages/restrict_su_command/apply.sh
  • stemcell_builder/stages/rsyslog_config/apply.sh
  • stemcell_builder/stages/rsyslog_config/assets/rsyslog.conf
  • stemcell_builder/stages/rsyslog_config/assets/rsyslog_90-bosh-agent.conf
  • stemcell_builder/stages/rsyslog_config/assets/rsyslog_logrotate.conf
  • stemcell_builder/stages/static_libraries_config/apply.sh
  • stemcell_builder/stages/static_libraries_config/assets/static_libraries_list.txt
  • stemcell_builder/stages/system_alicloud/apply.sh
  • stemcell_builder/stages/system_azure_init/apply.sh
  • stemcell_builder/stages/system_azure_init/assets/etc/systemd/system/cloud-config.service.d/firstboot-blocker.conf
  • stemcell_builder/stages/system_azure_init/assets/etc/waagent/walinuxagent.service
  • stemcell_builder/stages/system_azure_network/apply.sh
  • stemcell_builder/stages/system_azure_network/assets/01-azure-sriov-unmanaged.network
  • stemcell_builder/stages/system_azure_network/assets/10-azure-sriov-unmanaged.rules
  • stemcell_builder/stages/system_google_packages/assets/instance_configs.cfg.template
  • stemcell_builder/stages/system_grub/apply.sh
  • stemcell_builder/stages/system_kernel/apply.sh
  • stemcell_builder/stages/system_kernel_modules/apply.sh
  • stemcell_builder/stages/system_parameters/apply.sh
  • stemcell_builder/stages/system_softlayer_multipath_tools/apply.sh
  • stemcell_builder/stages/system_softlayer_multipath_tools/assets/etc/multipath.conf
  • stemcell_builder/stages/system_softlayer_netplan/apply.sh
  • stemcell_builder/stages/system_softlayer_open_iscsi/apply.sh
  • stemcell_builder/stages/udev_aws_rules/assets/nvme-id

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch manually-merge-noble-to-resolute

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@linux-foundation-easycla

linux-foundation-easycla Bot commented Jun 23, 2026

Copy link
Copy Markdown

CLA Signed
The committers listed above are authorized under a signed CLA.

@aramprice aramprice changed the base branch from ubuntu-jammy to ubuntu-resolute June 23, 2026 00:05
@aramprice

Copy link
Copy Markdown
Member Author

/easycla

@aramprice aramprice merged commit bd153f0 into ubuntu-resolute Jun 23, 2026
12 checks passed
@aramprice aramprice deleted the manually-merge-noble-to-resolute branch June 23, 2026 00:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants